Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cmake): properly exclude prereleases when fetching latest tag from cmake #2550

Merged
merged 2 commits into from
May 17, 2023
Merged

fix(cmake): properly exclude prereleases when fetching latest tag from cmake #2550

merged 2 commits into from
May 17, 2023
+7 −4

Conversation

FedeDP
Copy link
Contributor

@FedeDP FedeDP commented May 16, 2023

What type of PR is this?

/kind bug

Any specific area of the project related to this PR?

/area build

What this PR does / why we need it:

Given that we now support prereleases, we do want to exclude them from Falco version computation.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@FedeDP
fix(cmake): properly exclude prereleases when fetching latest tag fro…
09c3ad9 
…m cmake.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
@FedeDP
Copy link
Contributor Author

FedeDP commented May 16, 2023

/milestone 0.35.0

@poiana poiana added this to the 0.35.0 milestone May 16, 2023
@poiana poiana added the size/XS label May 16, 2023
@FedeDP
Copy link
Contributor Author

FedeDP commented May 16, 2023

Let's wait for the CI and check the values!
/cc @LucaGuerra

@poiana poiana requested a review from LucaGuerra May 16, 2023 13:13
FedeDP
FedeDP commented May 16, 2023
View reviewed changes
cmake/modules/GetGitRevisionDescription.cmake
--tags
--max-count=1
WORKING_DIRECTORY
"${CMAKE_CURRENT_SOURCE_DIR}"
COMMAND tail -n1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we ever needed it since we use max-count=1; it was probably a leftover.

@poiana poiana requested review from Kaizhe and mstemm May 16, 2023 13:14
@FedeDP
Copy link
Contributor Author

FedeDP commented May 16, 2023

-- Falco version: 0.34.1-200+09c3ad9

(github action build-minimal)

-- Falco version: 0.34.1-200+09c3ad9

Build-musl

@FedeDP
Copy link
Contributor Author

FedeDP commented May 16, 2023

Uh it seems circleci build-arm64 and build-centos7 weren't able to load the Falco version correctly:

Uploading /tmp/packages to /packages
Uploading /tmp/packages/falco-0.0.0-aarch64.deb (27 MB): DONE
Uploading /tmp/packages/falco-0.0.0-aarch64.rpm (22 MB): DONE
Uploading /tmp/packages/falco-0.0.0-aarch64.tar.gz (27 MB): DONE

@FedeDP
fix(ci): properly pass FALCO_VERSION loaded from extern to docker bui…
ab56e3f 
…ld for centos7 and arm64 builds.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
@poiana poiana added size/S and removed size/XS labels May 16, 2023
@FedeDP
Copy link
Contributor Author

FedeDP commented May 16, 2023

Uh it seems circleci build-arm64 and build-centos7 weren't able to load the Falco version correctly:

To fix this, i ported build-arm64 and build-centos7 jobs to the same flow we use in gha: load FALCO_VERSION on the host and pass it as a cmake option to the Falco package builder image.

@FedeDP
Copy link
Contributor Author

FedeDP commented May 16, 2023 

Uploading /tmp/packages to /packages
Uploading /tmp/packages/falco-0.34.1-201+ab56e3f-x86_64.deb (30 MB): DONE
Uploading /tmp/packages/falco-0.34.1-201+ab56e3f-x86_64.rpm (25 MB): DONE
Uploading /tmp/packages/falco-0.34.1-201+ab56e3f-x86_64.tar.gz (30 MB): DONE

Fixed build-arm64 and build-centos7. We should be good2go!

@FedeDP
Copy link
Contributor Author

FedeDP commented May 16, 2023

/cc @LucaGuerra @leogr @jasondellaluce

@poiana poiana requested review from jasondellaluce and leogr May 16, 2023 14:34
@FedeDP
Copy link
Contributor Author

FedeDP commented May 16, 2023

E: Failed to fetch http://ports.ubuntu.com/ubuntu-ports/pool/main/g/gnupg2/gnupg-utils_2.2.4-1ubuntu1.6_arm64.deb Unable to connect to ports.ubuntu.com:http: [IP: 185.125.190.39 80]

Arm64 is having some connection issues today; i already tried to restart it :/

@LucaGuerra
Copy link
Contributor

It looks great to me! Thank you for editing that tricky cmake function!

@FedeDP
Copy link
Contributor Author

FedeDP commented May 17, 2023

Still failing :/

@FedeDP
Copy link
Contributor Author

FedeDP commented May 17, 2023

🟢 finally!

@poiana poiana added the lgtm label May 17, 2023
Andreagit97
Andreagit97 approved these changes May 17, 2023
View reviewed changes
Copy link
Member

@Andreagit97 Andreagit97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@poiana
Copy link
Contributor

poiana commented May 17, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Andreagit97, FedeDP, leogr

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [Andreagit97,FedeDP,leogr]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit 7414c2d into master May 17, 2023
@poiana poiana deleted the fix/latest_tag_git_exclude_prereleases branch May 17, 2023 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Andreagit97 Andreagit97 Andreagit97 approved these changes

@leogr leogr leogr approved these changes

@LucaGuerra LucaGuerra Awaiting requested review from LucaGuerra

@Kaizhe Kaizhe Awaiting requested review from Kaizhe

@mstemm mstemm Awaiting requested review from mstemm

@jasondellaluce jasondellaluce Awaiting requested review from jasondellaluce

Assignees

@leogr leogr

@Andreagit97 Andreagit97

Labels
approved area/build dco-signoff: yes kind/bug lgtm release-note-none size/S
Projects
Falco Roadmap
Archived in project
Milestone
0.35.0
Development

Successfully merging this pull request may close these issues.
5 participants
@FedeDP @LucaGuerra @poiana @leogr @Andreagit97